Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Wed, 17 May 2017 18:13:16 +0000 (14:13 -0400)
committerTom Rini <[email protected]>
Wed, 17 May 2017 18:13:16 +0000 (14:13 -0400)

Trivial merge